[GLUTEN-11550][VL][UT] Enable Variant test suites#11726
Open
baibaichen wants to merge 1 commit intoapache:mainfrom
Open
[GLUTEN-11550][VL][UT] Enable Variant test suites#11726baibaichen wants to merge 1 commit intoapache:mainfrom
baibaichen wants to merge 1 commit intoapache:mainfrom
Conversation
4a21089 to
794a1fe
Compare
|
Run Gluten Clickhouse CI on x86 |
794a1fe to
c6759c0
Compare
|
Run Gluten Clickhouse CI on x86 |
c6759c0 to
d53e74e
Compare
|
Run Gluten Clickhouse CI on x86 |
Enable GlutenVariantEndToEndSuite, GlutenVariantShreddingSuite, and
GlutenParquetVariantShreddingSuite for both spark40 and spark41.
Changes:
1. VeloxValidatorApi: Detect variant shredded structs produced by
Spark's PushVariantIntoScan (checking __VARIANT_METADATA_KEY
metadata) to trigger fallback to Spark's native Parquet reader.
2. ParquetMetadataUtils: Refactor to single-pass architecture.
- Extract parquetFooters() returning Iterator[Either[Exception,
ParquetMetadata]] to read each footer once.
- Merge validateVariantAnnotation into isUnsupportedMetadata
with metadataValidationEnabled parameter.
- Variant annotation check is always-on (correctness); codec,
timezone, encryption checks are gated by config.
- VeloxBackend simplified to single validateMetadata() call.
3. Spark41Shims: Add shouldFallbackForParquetVariantAnnotation to
detect Parquet variant logical type annotations. Add
needsVariantAnnotationCheck to avoid unnecessary I/O on
Spark versions that don't support variant annotations.
4. pom.xml: Add -Dfile.encoding=UTF-8 to test JVM args. On JDK 17
with LANG=C (CI containers centos-8/9), the default charset is
US-ASCII causing garbled output for multi-byte characters. JDK
18+ defaults to UTF-8 via JEP 400.
See: https://github.com/apache/spark/blob/v4.0.1/common/variant/src/main/java/org/apache/spark/types/variant/VariantUtil.java#L508
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
d53e74e to
ff31977
Compare
|
Run Gluten Clickhouse CI on x86 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes are proposed in this pull request?
Enable
GlutenVariantEndToEndSuite,GlutenVariantShreddingSuite, andGlutenParquetVariantShreddingSuitefor both spark40 and spark41.Changes:
VeloxValidatorApi.scala: Detect variant shredded structs (produced by Spark's
PushVariantIntoScan) by checking for__VARIANT_METADATA_KEYmetadata on struct fields. Triggers fallback to Spark's native Parquet reader since Velox cannot read variant shredding encoding.ParquetMetadataUtils.scala: Refactor to single-pass architecture — extract
parquetFooters()returningIterator[Either[Exception, ParquetMetadata]]to read each footer once. MergevalidateVariantAnnotationintoisUnsupportedMetadatawithmetadataValidationEnabledparameter. Variant annotation check is always-on (correctness); codec, timezone, encryption checks are gated by config.Spark41Shims.scala: Add
shouldFallbackForParquetVariantAnnotationto detect Parquet variant logical type annotations. AddneedsVariantAnnotationCheckto avoid unnecessary I/O on Spark versions that don't support variant annotations.pom.xml: Add
-Dfile.encoding=UTF-8to test JVM args. On JDK 17 withLANG=C(CI containers centos-8/9), the default charset is US-ASCII causing garbled output for multi-byte characters. JDK 18+ defaults to UTF-8 via JEP 400. See VariantUtil.java#L508.How was this patch tested?
GlutenVariantEndToEndSuite14✅,GlutenVariantShreddingSuite8✅,GlutenParquetVariantShreddingSuite5✅GlutenVariantEndToEndSuite14✅,GlutenVariantShreddingSuite8✅,GlutenParquetVariantShreddingSuite7✅Was this patch authored or co-authored using generative AI tooling?
Generated-by: GitHub Copilot CLI
Related issue: #11550
Note: This PR subsumes #11723 (GlutenParquetVariantShreddingSuite).